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

Change-Id: Ib1fea4e2a10361ea78282267292671fc2c182cc0