Merge "Camera: update NDK LSC header"
am: 6d59728432

Change-Id: I2a343edb2c23f9008ecc2fea18f3b229afd6df6a