Merge "Platform shouldn't directly link to jars in APEXes" am: 510d7bf4e7 am: 0902172e9f

Change-Id: Ibd1567142b4cc77e9b3214ab9c3445650ffe69e8