Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev