Merge "Change enums in ImageWriter to `enum class`."
am: f81cd81010

Change-Id: I91b203c4c25ff4f33157a49a884be207f51c1813