am 89629d4a: am 31ffae8c: am 388c6e27: Merge "ART: Fix stub test inline assembly for x86"

* commit '89629d4a21311f7bb8c52615995d44ca79d02743':
  ART: Fix stub test inline assembly for x86