Merge "Move StrictJarFile from libcore to framework"