Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into klp-dev
am: 22d6575710

Change-Id: I0c2a4ebf1ce1e47a819f2ea2e67ea4bb6f055526