Merge "Camera2 NDK: Update lensShadingMap documentation, remove duplicate" into nyc-dev