Merge "Install a unified fstab in the emulator image" into jb-mr2-dev