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

Change-Id: I9928429d425d60c08568535495cffe3caa4de992