Reconcile with honeycomb-release

Change-Id: Ibbe91b2c58ef41c449cb4b125b4b6e4034a71ed5
tree: c7563010d0992524be11bd4a77de268faa37f543
  1. libvideoeditor/