Merge "Camera NDK: fix headers" am: fa87fc3b31
am: 9addb6e1b1

Change-Id: Ie034ecc0fff542fefcba0ce1f4e09c2b15ef87b8