Reconcile with ics-mr1-release

Change-Id: I49813a61d932c0d7b0562f8706292494c4c04e9b
tree: 379f9bbe990a0c21ba2bff16d3b8c44853aaa7fc
  1. libvideoeditor/