am 4c89dc3d: am c94a705f: Merge "Use fstab in the source build"

* commit '4c89dc3d3e7ca5f83e8f56cef2641fb9ad426f31':
  Use fstab in the source build