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

Change-Id: I5eddc2d7dea33f67fc1543665476646f9850c661