tree 7695611490e6d3f3c607bd67d24ae7e5fc4d7d11
parent 4ef094f6e3b6558c6c356b94003873ad9146740d
parent 7fed2aa21aec621cd8c3c27261fae910b9bd8ad7
author Elliott Hughes <enh@google.com> 1588187711 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588187711 +0000

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

Change-Id: Ib6196ddb7274769e66da1965be3feef54704e2b0