Revert "Revert "Cleanup transitive includes in the legacy inlines.""

This reverts commit 9cb8639b.

Fixed all the broken builds that were reported to me before this was
reverted.

Test: make checkbuild  # kikey960, marlin, aosp_arm64; master and aosp