am 7475afa6: am 42e05e04: Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev

* commit '7475afa6991a93f66c45e98e11c408c601a48b7b':
  remove reference of emulator vold.fstab which is no longer necessary