Use VanirAOSP Correct Aliasing Fixes

Change-Id: Ibfc16b66c0285510184ba3e9a92800d91e34c7b3