Merge "Camera: update NDK camera API headers" am: 6aab0f5838
am: edaa9211e4

* commit 'edaa9211e42ca692a4e6a66d405470b0af39d8cd':
  Camera: update NDK camera API headers

Change-Id: I891981c3f695df1aae80d21610b1eb9bf0c148ea