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

* commit 'cd6e04f738ee17b3e8ec51c1f14d636fa2a89a55':
  ART: Add lock and unlock stubs for ARM64, fix for X86-64