Merge "Add suffix .so to use directly libart.so"