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