Merge "camera: Add OIS data keys"

diff --cc camera/docs/camera_device_info.proto
Simple merge

diff --cc camera/docs/docs.html
Simple merge

diff --cc camera/docs/metadata_definitions.xml
Simple merge

diff --cc camera/include/system/camera_metadata_tags.h
Simple merge

diff --cc camera/src/camera_metadata_tag_info.c
Simple merge