am 9961929d: Merge "Fix "const-class v0, I" for libartd.so"

* commit '9961929db4fce2143df10df60fa29cc8ee7b00d7':
  Fix "const-class v0, I" for libartd.so