Merge "Compile android_system_stubs_current against core_current"