Merge "Make core.current.stubs a proper subset of android.jar"