tree 3afa74250707e4509dd92b61982ef9f94283f8fa
parent f332ce776d9b19d3f6cc795d4f19dfbf54f85bd3
parent fafd3b2df156b8da0958aa3d92cdc569f286ea83
author Treehugger Robot <treehugger-gerrit@google.com> 1586222942 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586222942 +0000

Merge "Remove old vndk logic" am: 560c50f6cd am: f8ca862c09 am: 464cf23382 am: fafd3b2df1

Change-Id: Idfcd1c96700716ce34ab615db4e7ae6410623af2