Reconcile with ics-mr1-release

Change-Id: I712537045ade8ec23936caddcdbf95fbba0ef9a8
tree: e6ef5f3d8965bcbb43ea303bf422b53be2e86cf5
  1. libvideoeditor/