Merge "Camera2: fix Face class java doc build break" into klp-dev