Merge "recovery: Fix mounting /system with dynamic partitions."
am: 023807fcf7

Change-Id: I6c73435e685a94ab36e872c6abd479ece3ca1af9