Reconcile with ics-mr1-release

Change-Id: I90ea8a02a4bb9b357d7bddfa1a02602d3de839fa
tree: b4c33f0ec38521c31bb0e75ea3364ac05a665419
  1. libvideoeditor/