Use VanirAOSP Correct Aliasing Fixes

Change-Id: Id7967b511d8bd5bd8bcf8ca74f2155ea1b4bce01