Merge "Exclude android.test.AndroidTestCase from CtsJdwpTestCases" am: bc8ac72024 am: 0483477f29
am: 02981c4f4e

Change-Id: If5c147ad9220a52792553e82522509c737718162