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

Change-Id: I716a256a0320dfe65b6138b6335063789836ece3