Merge "Let jvmti allow JDWP connections" am: 05e6d30b53
am: a66edbce26

Change-Id: I1ecc65ca5832bc3bef70a7a6352a0514c8809703