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