Merge "test: Modify 633-checker-rtp-getclass for javac/dx" am: 3dc94c4763
am: 8dcaa31125

Change-Id: Ie21c2f37878d045f0ac136168c18fa86b865d291