Merge "Camera: update NDK header" into nyc-dev
am: 741aeff98a

* commit '741aeff98aee206a8c996cf03ca29bc018d0a292':
  Camera: update NDK header