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

Change-Id: I329daddc88cde2bb0e03c64e4ac83d0b5af06016