Merge "Merge "Camera: Fix passing video native handle for 64-bit app" into nyc-dev am: 9e23567ed0 am: 20be7bf5ba" into nyc-mr1-dev-plus-aosp