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

Change-Id: Id7254a11b3a5eaab2b1da51448849567290333fb