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

Change-Id: Ib677c8a314a668dd7f21849b687f133982a10f5c