Merge changes from topic \'rm-awesome\'
am: 1d975c4b9a  -s ours

* commit '1d975c4b9a0cf77845b15eff41a1f076fd8f309a':
  stagefright: Remove OMXCodec object
  stagefright: allow selecting codec by name in SimpleDecodingSource