Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into klp-dev am: 22d6575710 am: 4bec033ded
am: 5c1f01675c  -s ours

Change-Id: I9a27186dd8c57aaf4a7c0385c2c521945c6fcd1e