am e9ee5e11: am 5411ef9c: Merge "emulator: increase system partition size to 400M"

* commit 'e9ee5e11b499f5be72b365585001e310b776d698':
  emulator: increase system partition size to 400M