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

* commit '6aab0f5838c86ce588d544e1e518938c3b6c38fb':
  Camera: update NDK camera API headers

Change-Id: I0bdf3fc27dba4ea97ce063637bfa9b789e97afdf