Use VanirAOSP Correct Aliasing Fixes

Change-Id: Id36c75ff4f61c6dfe95a8f06224797d7e02d1658