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