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

Change-Id: I8c226e4a0362cd7a1025a7cc264d4cb488bf75ca