Merge "Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION" into pi-dev
am: 89ff1df0b4

Change-Id: I7b1b6440f4391fa1a0612321d2b09bf26cd6ad5c