Merge "Make ext build against core.platform.api.stubs" am: ff296e75ce am: f678d38b9a
am: 44f521a39f

Change-Id: I3d8ae281f8c8ba3497b7b2cc13ac3527845984ed