Merge "Revert "Revert "Cleanup transitive includes in the legacy inlines.""" am: 13cec459 am: d85d7f4c am: d5e9d224 Change-Id: Ie0131d28daba4292fc23cc418545a0ad04e38895