Merge "Move image_classes_ to CompilerOptions."
am: 0e4ecbe581

Change-Id: I774385f52fe597cf730223b6737d7c81cadce101