Merge "Camera2: Deprecate LENS_RADIAL_DISTORTION, add LENS_DISTORTION" into pi-dev
am: 1486849e8b

Change-Id: Ie4195451c9c0084973dc0c1f758eb81c99977f96