Merge "Find or guess installed libraries for VNDK library list" am: 4b45eab15b am: 19e70b0c38
am: 03b4c63e2c

Change-Id: I3d2beb2c7568f10b1f416f9bbceda8ade3c6d7e4