Merge "Add a module for extra VNDK library lists" am: 7890f3b315 am: 4ff901fdde

Change-Id: I14f86de294d31ed4c1062dc3b5a8970f792ba43b