Merge "libhardware: Add camera_info typedef" into jb-mr2-dev