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

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