tree 5a3f4740fff375a6a266b1d4759b8e35adeef8af
parent a82c2344ac6480b25077c233e564476122233a80
parent f8ca862c098980a551a16ea9697e8b33c66d514d
author Treehugger Robot <treehugger-gerrit@google.com> 1586220493 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586220493 +0000

Merge "Remove old vndk logic" am: 560c50f6cd am: f8ca862c09

Change-Id: I565288462fed11e2a3416e88da75d23a628b4318