am 42174336: am 3049c672: Merge "stagefright: add codec capability info for google video codecs" into lmp-dev

* commit '4217433611bf804d8fcdee0f3a2369c4c4610823':