Merge "Revert "Cleanup transitive includes in the legacy inlines."" am: 1ef6a6ad am: e7b0fe79 am: 7b1142e8 am: e8ce21dd Change-Id: I99e78c6e4e9ee833a77da22d74c08c08c5f11570