Use VanirAOSP Correct Aliasing Fixes

Change-Id: I87fcae1217f8d7ea77f648aec1aa8346a0b23c32