Merge "Correct the order of expected and actual values in CameraTest." into gingerbread