Merge "Add classes need by framework to core.platform.api.stubs"
am: 095c5000c7

Change-Id: Ie0ab684e7b044c3af53314b7f948733b9e02052a