Merge \\\\\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid...

Merge \\\\\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\\\\" into klp-dev am: 22d65757 am: 4bec033d am: 5c1f0167  -s ours am: 495ba35a  -s ours am: f45a909f am: aec4789b am: 24bf4834  -s ours
am: cafbcedf

Change-Id: I936c97bb379b68a4ecb85c0ce7f82f60f865aac0