Use VanirAOSP Correct Aliasing Fixes

Change-Id: I9ec95e3ce2ece4d3c9abe19cc73b98e68d9099f3