[automerger skipped] Merge "update vndk list" am: d080b339 am: f416970f...

[automerger skipped] Merge "update vndk list" am: d080b339 am: f416970f am: 85847547 -s ours am: 2301f7f7 -s ours

am skip reason: Change-Id Ic53702ede81f9edbc8e29e92df4470b99b696098 with SHA-1 46cdb2f9 is in history

Original change: https://android-review.googlesource.com/c/platform/build/+/1588252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78292b864bcda2624c066efe446c74460186523d