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

Change-Id: I14b593fa50f2a22d76ebc04c040838836c9af362