am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"

* commit 'bd4c482be9c060d92919080c37e0d14fca94d2aa':
  Clean up AssetManager::scanAndMergeZipLocked

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base