Use VanirAOSP Correct Aliasing Fixes

Change-Id: I8bf3155f9f934184e47ed995922b9bd23723f390