Merge "Camera3: fix HAL3.x version check issue"