Merge "Fix classes.jack extraction from platform.zip"