Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into mnc-dev
am: f0dc08a910

Change-Id: I1ce29159fdfc1fe343e91df11d804902720bdcbf