Revert "API changes as requested by API council."

Revert "API changes as requested by API council."

Revert submission 1662226-compatibility-rename

Reason for revert: Broke aosp-stage-master.
Reverted Changes:
Ie465c49ff:API changes as requested by API council.
I3c5a5734b:API changes as requested by API council.
I16bf86a9c:API changes as requested by API council.

Change-Id: I3af51d240cec9dac013d81dc448b44ef2ca60f9c