Add mount hacks to fstab

Change-Id: I117a6b09ea51b91d6ff1e1d955228772858bd76c