Merge "Camera NDK: fix typedef name" am: c4defa724e am: 3b318a6b73
am: a8ed92b08f

Change-Id: I543d7bdd9206ded8b2383b62ee20b705caaa141b