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

Change-Id: I76a21209b0366b081f72bfdde9769cf477c3c19b