Merge changes from topic 'yahan_incr_image_size'

* changes:
  Increase system image size for arm64 to 2.5G to fix buildbot
  Increase system image size for x64 to 2.5G
  Increase system image size to 2GB for the emulator