[automerger skipped] Merge "emulator: support dynamic partitions" into qt-dev
am: 3c818c4c -s ours
am skip reason: change_id I9d486f57ac4ec11b1bbe9ab97890d12441c3054e with SHA1 c73e9b70 is in history
Change-Id: Ia635a635930b6527d75a6e0ffc63698239e616d9