Merge \\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\" into mnc-dev am: f0dc08a910 am: 6a2589182d am: 94763125c7 am: 7eebfad940  -s ours
am: d65729c506

Change-Id: I1b10828a1f43bcb54d91323eed887489d5bfd2cf