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

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