Merge "Fixed the camera test instrumentation target naming issue." into froyo