tree 7695611490e6d3f3c607bd67d24ae7e5fc4d7d11
parent 814672ab94dc01dfa74f12064ccf855b3258c8a9
parent 12413aa875853c96201aaf4c4480a198805538da
author Elliott Hughes <enh@google.com> 1588186763 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588186763 +0000

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

Change-Id: I12281cc37f8838407d4e2f8eed2fc27094a72da2