Merge "Add JDWP failures found by buildbot"
am: 85f8c70741

Change-Id: I464c44c4fa8caebeeef5e7d350df4ae0d40e6940