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

* commit '95b9d04d74e47f4e13ad6941155d2227767ff026':
  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