Merge "core.current.stubs: add LOCAL_PATCH_MODULE := java.base"