Merge "Fix using StrictJarFile that is @hide API"