Reconcile with ics-mr1-release

Change-Id: I50ea08700096cc77b6af3838bb4adbc21062de1c
tree: e2ae11f95f4f4ac4aae1ee920af112f5a2fd565d
  1. libvideoeditor/