am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev
am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev

* commit '4683a10f9c8c73056e5e1f9748ab9eee701dc3fa':
  Also consider secondary storage when verifying paths

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