Merge "ART: Add lock and unlock stubs for ARM64, fix for X86-64"