Merge "Camera NDK: fix headers"
am: fa87fc3b31

Change-Id: Ic72dfb8129a20ae1feb319e463b8713d2e97c98e