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

Change-Id: I68de90dcbd6453609197e3fb7b0f8f7c4473e482