Merge "Camera: Update for video buffer binder changes" into nyc-dev