am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev

* commit '56477eb724972c2fe0441dfa7baaad00b7927add':
  StageFright: Removes hacks for Nvidia MPEG2 decoder