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

* commit 'e6065fdcb8f35ab35ab46cce754b5b3b85c54991':