Merge "camera2: Fix template requirements" into oc-dev