Use VanirAOSP Correct Aliasing Fixes

Change-Id: I24ef5051f6d3693af99d83c7bbdb184dde56b2ca