Merge "Enable 64bit RS compat lib to build."