Merge "Allow apexes to link against more libs" am: 6c364f94ad am: 73b4968059 am: 32545e5c21

Change-Id: I7b15e47d5b5cdcfd6e22bd1537d627d4ba1529d7