Merge "Use fstab in the source build"