Merge "Use soong-generated vndk*libraries.txt files" am: b435f68fd2 am: 4fa3b43cc2
am: 5ad5d1b50e

Change-Id: If93ae0818968ba614fff518ae94c5650c0aea2e1