Merge \\\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\\" into klp-dev am: 22d6575710 am: 4bec033ded am: 5c1f01675c  -s ours am: 495ba35a17  -s ours am: f45a909f14
am: aec4789b06

Change-Id: I8d30a1d2c304de0f3ce748e03a975c46bbc6164e