Use VanirAOSP Correct Aliasing Fixes

Change-Id: I7563c5d72197a9298a7d321244df3cf59724a1fc