am 88f82b66: (-s ours) am 39087653: am 13d62278: Merge "Skip mounting /, just mark block device as ro if needed."

* commit '88f82b66503c684650ce0f6fb68173d101aa672e':