[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 skip reason: Change-Id I7ce7dad8c02b094c565daf8c178bc6f89bb610ef with SHA-1 791551a7 is in history
Change-Id: I6b6dcd2d7e2340db0d163dfb570f1decd55727fd