Merge changes I9ab41b56,I61e4ca9b

* changes:
  Add color mode enums
  add android_flex_layout for describing all flexible formats.