Merge changes Ia8fb5696,Id5ae6645

* changes:
  build_image setup ext4 dedupe on more images.
  build_image tune right-size image