Merge "graphics: reorder PixelFormat" into oc-dev am: 0875af5cbe
am: add0bdd5a2

Change-Id: Id27d97cf28468ad01431719c64bc449903e8712c