Merge commit 'dae6f22eb3b062aee703886796645fa480c714aa' * commit 'dae6f22eb3b062aee703886796645fa480c714aa': fix a bug with RGBX_8888 surfaces would be rendered incorrectly by the MDP.