Merge "Clean up AssetManager::scanAndMergeZipLocked"