Merge "Compile core.platform.api.stubs with compile_dex:true"
am: ebd71c3d2e

Change-Id: I23d2391f2037b3857ce38cd67d178018ab28841d