[automerger skipped] Merge "Add vndk-lib-extra-list-current.txt" am: 6a226c1aca am: 5e1ab1043a
am: 68acaa4e15  -s ours

Change-Id: Iba64013b853e407697bd60e2bdac3732ecdcce7a