am 786810c4: am 3583bc84: Merge "Revert "mako: add \'journal_async_commit\' into fstab.mako"" into jb-mr1-dev

* commit '786810c425f47f793301daab0dce2e763d0da2dc':
  Revert "mako: add 'journal_async_commit' into fstab.mako"