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

Change-Id: I753dc722ea9b5ce0d344419ec1e87192bd2faf4f