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

Change-Id: Id4e27f5a6dfba9a0fb80c7b8922bb6c2bc8a03ea