Use VanirAOSP Correct Aliasing Fixes

Change-Id: Iba1cf2acdee16ce507646b453297b39fa6c901b6