tree c75ffe61e47365cc44da5c8d3e2586060c607f8f
parent 21c6067ebbbf1d86a7a994e791badbb07bfa7a88
parent 2f429160c14596ae938b1e93218e0a74ccb744d6
author Colin Cross <ccross@android.com> 1570047961 -0700
committer android-build-merger <android-build-merger@google.com> 1570047961 -0700

Merge changes from topic "filter_arch_properties"
am: 2f429160c1

Change-Id: I20821e595ad22a08ebc64a0a6c779ddf021e8a86