am 4afe808c: Merge "Fix all the system image sizes."

* commit '4afe808c640ac2bfdd1e665d322b7c9fbe38a974':
  Fix all the system image sizes.