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

* commit '4f072e140bba2422eae14270f22174398a86a0ba':
  core: Let the build specify mount options for recovery