Merge "cameraserver: Avoiding deadlocks while calling getSystemCameraKind()"