Merge \\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\" into mnc-dev am: f0dc08a910 am: 6a2589182d am: 94763125c7
am: 7eebfad940  -s ours

Change-Id: I4c1039359749a5e7c781999f41998c22995422de