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 am: e933b06ea8
am: 5fda9b4ea6

Change-Id: Iaeb2c4fe9ffe86ad7afcad8a4ae3f072303d1af7