[automerger skipped] Remove software flex pixel formats am: 7bdadae7f0 am: 83e45dd62d  -s ours am: e6bedcc198  -s ours
am: 3a6bad5944  -s ours

Change-Id: I009c54c5ef67e6db6bde24e6ef09d07ac5a06ecd