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

Change-Id: I26487e8565aa190cff6e470bfdbc312b5ec83ceb