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

Change-Id: If8429b6ae3bbe40d42a212f9b799567154411a5a