Merge "Camera NDK: fix typedef name"
am: c4defa724e

Change-Id: I186b7ce685cd6459f211082905d668ecd780778d