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