Merge "emulator: support dynamic partition"
am: 55923e295c

Change-Id: I47e2e989dacd3c1bf390e0b27c6b347623e3c7a5