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

Change-Id: I79897683ad856069fc43e8fde4fed1070838127b