Use VanirAOSP Correct Aliasing Fixes

Change-Id: I776c00cda99a8b1e7de85e1df96370b9f22e4b4b