Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 am: 4c65d49a92
am: de915e3ade

Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa