Use VanirAOSP Correct Aliasing Fixes

Change-Id: I1f2a2411e6bf819ef5319c33e89e291ed17dd79f