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

Change-Id: I5f316563ea3551f03409d95daf21aab453e60711