Merge "Fix JarInputStream Manifest parsing."