[automerger skipped] Merge "emulator: support dynamic partitions" am: 73c9f03b
am: 489a1e56 -s ours
am skip reason: change_id I9d486f57ac4ec11b1bbe9ab97890d12441c3054e with SHA1 c73e9b70 is in history
Change-Id: I66df3de0a1580ae1e4295f54313a082b31a49557