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

Change-Id: I73bf391e7e7d189da52a01aef964ee3799d57d5d