Merge "camera2: Update Face class." into klp-dev