Revert Android.bp workaround. am: c3d97aa421 am: b5c76409c7

Change-Id: I54663cc2acacb4c7eddcfa6a89a2d8048ea24704