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