am 6d12cbc5: am d5198cbc: Merge "Install a unified fstab in the emulator image" into jb-mr2-dev

* commit '6d12cbc5bc8df4a86da262564a59985da97b9741':
  Install a unified fstab in the emulator image