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

* commit 'c2037b753c73d13ca4cb050cd570ba0c5e3b15a7':
  Camera: update NDK header