Merge "Modify RedefineClassesTest to support running on android"