am 918c56c7: am 32130c6d: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev

* commit '918c56c7a157b56ea0dc037786627a8101e15cfe':
  Include videoeditor_jni in sdk product build.