Merge "camera2: add sensor.temperature optional key. clear up some metadata definitions" into klp-dev