Merge "art: Fix build errors for x86_64 target"