am 4e69dfed: am 9d1f5afc: bionic: update processed kernel header msm_camera.h

Merge commit '4e69dfed0b0fe672e366bb84d5c3feaedc61d630'

* commit '4e69dfed0b0fe672e366bb84d5c3feaedc61d630':
  bionic: update processed kernel header msm_camera.h