Merge "camera2 api: Add CameraMetadata get/set support"