tree 11d387a96bc9289b48c366753aa21521ae73b8c0
parent 09bb178aeaafc940ed999af2179ff7222b7ef51a
parent 563533c0e65c373273990cf54ac230c50ecbe546
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582233809 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582233809 +0000

Merge changes from topic "soong_tests_ndk" am: 53fe467c67 am: 563533c0e6

Change-Id: I0e2cbd23cf3471129102c850c987a6c9f20590a2