Use VanirAOSP Correct Aliasing Fixes

Change-Id: I4a31c610a982ded6e96cd04a52dd971fffdb564c