am cb0acff2: am 5ee4186d: Merge "Change JniInvocation default to libart.so"

* commit 'cb0acff245649434bd93456369101d769750c5a2':
  Change JniInvocation default to libart.so