Merge "Revert "Revert "Revert "Cleanup transitive includes in the legacy inlines.""""
am: 7669c68964

Change-Id: Ifd21b23c4bc5a7b0cf42b608847a0a331404e079