Remove software flex pixel formats am: 7bdadae7f0
am: 83e45dd62d  -s ours

Change-Id: I74938e5dc417307aa93b0f715225a7250aff6e17