tree 64d5d2f0bd6957be4e2ed84a0f04a30e9f818b67
parent c9668b3f75b8a91efc4d547f80b87421183656ff
parent b5c76409c72bb1a024a0a8999af3c50cc84ab578
author Elliott Hughes <enh@google.com> 1588186777 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588186777 +0000

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

Change-Id: I54663cc2acacb4c7eddcfa6a89a2d8048ea24704