Merge "SnapdragonCamera:wrong Ubifocus image"