am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."

* commit '3fd097f8a81b57046f7200f659211971025ad7bf':