[automerger skipped] Merge "Stop building against core_platform where...

[automerger skipped] Merge "Stop building against core_platform where possible" am: 6e5cb61c am: 7cf9711b -s ours am: 00fc64db -s ours am: 218a19ba -s ours am: 95d0c51d -s ours

am skip reason: Change-Id I7ce7dad8c02b094c565daf8c178bc6f89bb610ef with SHA-1 791551a7 is in history

Change-Id: Ie93670f0a11c8485b0c18132955540810a891c4f