Revert Android.bp workaround. am: c3d97aa421 am: 12413aa875

Change-Id: I12281cc37f8838407d4e2f8eed2fc27094a72da2