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

Change-Id: I120a53e20423bd4df63a22e1abf8aee54f12cc9d