am 2b095b74: Merge "Software MPEG4/H263 video encoder is now OMX-based" into jb-dev

* commit '2b095b74526cf5c9472131452600a02d8a66c32e':
  Software MPEG4/H263 video encoder is now OMX-based