Use VanirAOSP Correct Aliasing Fixes

Change-Id: I4d23711e64ab33fabf46ef67052598d19803a82d