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

Change-Id: I22f34d0a224685be2c960a28d36e917528fddda9