Merge "Modify RedefineClassesTest to support running on android"
am: 2e291b55f7

Change-Id: If07f18a73b4bd998d64eaa465202fb0582a6157b