Clean up AssetManager::scanAndMergeZipLocked

Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.

Change-Id: Ia93c3ab3fa688ce013dd9febbf0f4bd3ee1f3e5e
1 file changed