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

* commit '31ffae8c02e85818cf4b7cb88d8d2a6d0685cf14':
  ART: Fix stub test inline assembly for x86