Merge "Camera2: Fix spelling mistake" into mnc-dev