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

Change-Id: Id1e326911bebf1d9ef732eb45faa4119cd83d541