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

Change-Id: Ib6196ddb7274769e66da1965be3feef54704e2b0