am 41406a64: am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev

* commit '41406a64e9777fe95f36e5774e08466d54ff3501':
  Remove optional video encoder: MPEG-4 SP