Merge "Camera2: Fix build: Add new key to API" into klp-dev