am 56fbb4d7: (-s ours) am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP format in SoftwareRenderer"
* commit '56fbb4d7':
Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer"