am a682f6db: am 4e132ca5: Merge "emulator: increase system partition to 550M"

* commit 'a682f6db7b3e1259ce4abc829bd6763850565494':
  emulator: increase system partition to 550M