Merge "Add a module for extra VNDK library lists"