Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89
am: 615f9e1277

Change-Id: I9ea51423e88f90648f480c55d4567db6cee6ef98