Merge "Camera NDK: fix include header"
am: 2178e2c810

Change-Id: I4a12044f141039ee04a8bbfe1463dfc722cc7f51