Merge "Camera2:we should use the same storgae location for back and front camera"