Revert Android.bp workaround. am: c3d97aa421 am: 12413aa875 am: 7fed2aa21a am: 0e1fbbfc81 am: 75ace17cb1

Change-Id: I91de8a8a8ccdcb1ed2f5e2375e1c1836d1fcdfb0