Use VanirAOSP Correct Aliasing Fixes

Change-Id: Ieb35d4f0baa8d82e789ad3705cadf6c33a900fdc