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

* commit 'c94a705f445aa7edc2a30b364b59fe8becb02f11':
  Use fstab in the source build