Merge changes from topic "nextgen-release-img-zip-cleanup"

* changes:
  Nextgen release: Don't build super_empty.img
  Add option to allow product makefiles to skip building super_empty.img