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

Change-Id: Ifb93e620f5cfb32b1e17319cdab8a86e02f60462