Use VanirAOSP Correct Aliasing Fixes

Change-Id: I49eb8922a8e4da202a781a86b32eee2f7238c87b