Merge "Use soong-generated vndk*libraries.txt files"
am: b435f68fd2

Change-Id: I60355c215cdd320314423be9daa679fb0de7d6dd