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