Merge "libhwcomposer: VSYNC_ACTIVE ioctl -> VSYNC_INT" into jb-dev