[automerger skipped] Merge "emulator: support dynamic partition" am: 55923e295c
am: b7d78bb57b -s ours
am skip reason: change_id I68895c39c4f48f53077a4e766718c63b1d1da91a with SHA1 edb348c7c2 is in history

Change-Id: I2bb2591af37deb40f661530a5da95fdd277de1ba