Merge "libhardware: Add camera_info typedef"