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

Change-Id: Ie3fe053c51741c4e80c42b03bd09ee017d4ffbac