Update legacy headers in the new directory.

Headers were moved in AOSP first, so we
need to copy over the internal changes.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Importing legacy code.

Bug: 271177978
Test: m
Change-Id: I873de49dc5e3371865725170ef9409a6df206235