am 5cf79292: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5cf79292b8838880e6059bca7e2415161d0dfb84':
  JOO86
  JOO85B
  JOO85
  JOO84
  JOO83C
  Include videoeditor_jni in sdk product build.
  JOO83B
  JOO83
  fix PDK build
  Use prebuilt for PDK builds.
  JOO82C
  JOO82B