Revert Android.bp workaround. am: c3d97aa421 am: 12413aa875 am: 8e844dda7d am: 4eeebf53d6 am: 650663db83

Change-Id: Ia73386cb60079180ef6ba30ad3ba05f0ba94c533