Merge "Fix ExtractToMemMap to show original zip file name in ashmem"