This reverts commit bba0ef24c2. Reason for revert: Broke aosp_arm64_ab-userdebug build on internal master. Change-Id: I04ca552174bc2731cb69ee8485d50f4c190c0d27
bba0ef24c2
2acb2d5bcf
200da242a5