am fd5aca8b: am c86bcf5f: Merge "add videoeditor libraries to make" into honeycomb

* commit 'fd5aca8bb196e24b8b9c8189e2389f4f9087f804':
  add videoeditor libraries to make