This reverts commit 4d954eee. Reason for revert: we need to #define this in the .h file for callers anyway. Change-Id: Ifcd68d3bb051b49422b4242bc0c3d77ce1f4021c Exempt-From-Owner-Approval: Android janitor