Merge "Stop building against core_platform where possible"