Merge "flo: update camera kernel headers" into jb-mr2-dev