Merge "Add java_api_library equivalence of android-non-updatable.stubs"