am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread

Merge commit '6be030af2907cfbbfe59bd207e07f09c45ec4588' into gingerbread-plus-aosp

* commit '6be030af2907cfbbfe59bd207e07f09c45ec4588':
  remove remaining refs to max_image_sizes