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

* commit '854ae7f9ba8981e0122549dceae9b371ad4f7be1':