Merge "fastboot: Fix flashing both slots with dynamic partitions." am: d016c75104
am: f7caae0a69

Change-Id: I7d4a56f1406d93835c217969d70217fc5b21f1b9