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

Change-Id: Ife57d98dd6619c31fe7a67a252560d0d89eb8014