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

Change-Id: I10c8492cf11f8e51ea9eebac29dd89f171a6ec90