Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into lmp-dev am: f832feb17b  -s ours
am: 817545929d

Change-Id: I0cdde9b06adb1f522783df3e35943fd761090cca