Revert Android.bp workaround. am: c3d97aa421

Change-Id: Ib7ebf15d1b7d3f8ff7d8786caded9d02e794108c