Merge "migrate *.libraries.txt from Make to Soong" am: 7e5fb6b322
am: 3c7735e9d6

Change-Id: Iad0cba5bb9db72bc1ac7cbd64d634b0758b3d455