Merge "Build tests against core library impls, not stubs"
am: 867fa7c988

Change-Id: Icce7f5adb236b18265e1a72fe09a34f0c0b7a1df