Merge "Revert "Revert "Add basic image writer support for app images""" am: ae04419075 am: 578c1aa650
am: d441b45bcd

* commit 'd441b45bcd12addc514e2de8e9994862207eb911':
  Revert "Revert "Add basic image writer support for app images""