Merge "Stop building against core_platform where possible" am: 6e5cb61c2a

Change-Id: I6e100e0c5caae80b4adb62bdc0028fb56f2d7490