Merge "Remove broken code for mounting encrypted OBB files"