Merge "Fix "const-class v0, I" for libartd.so"