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

Change-Id: I446ffa9ac83122d3f31258f658d4393d42e26e38