Merge "Revert "Revert "Cleanup transitive includes in the legacy inlines."""
am: 13cec459d7

Change-Id: I71fa9467f710a9ea1849a4515efe8c6d42381982