Merge "Add missing FlushCloseOutputFiles to CompileImage"
am: 981fffca20

Change-Id: Id3b5cbb50f3214a701914b0da92bc8615f950128