am 4d48e3e0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4d48e3e0543d99e53668a036d782a6fb42d2b6f6':
  Build bugreport paths for emulated storage.
  Always read bugreports from EXTERNAL_STORAGE.