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

Change-Id: I046afc32456c3cc4196aa2ff8bd19217b8a7be71