Merge "Camera: use framework header for VideoNativeHandleMetadata" into oc-dev