Use VanirAOSP Correct Aliasing Fixes

Change-Id: I935a1291a48d2d175ea08807cb62f2d0acb63e73