Merge "Revert "Revert "Revert "Cleanup transitive includes in the legacy inlines."""" am: 7669c689 am: 34cf31a8 am: f25a7664 Change-Id: Ic63ed028cfe57fd02564d59a8af8feeae9bbb4dc