am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev

* commit '7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8':
  core: Let the build specify mount options for recovery