Merge "Replace CHECK with a failure return value when mCamera->setParameters()...

Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread