Merge "Camera2: fix doc build" into mnc-dev