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 am: 24bf483418  -s ours am: cafbcedf68 am: 834e0e3fae
am: 1b14a5eed6

Change-Id: Ib01c5b09632371e0771ddd7b38d43b2338133f72