am cbc388ca: Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev

* commit 'cbc388ca6a363d5228e69fdab5c583877a760280':
  Move eglSwapBuffers out of HWComposer