Merge "Move image classes options from art to AndroidRuntime [art]"