Merge "Revert "Make the runtime default to not allowing JDWP again."" am: 95fa4fd338
am: 60c06f4249

Change-Id: I24c5e5954a605b40fef9430d530ed042efa4cd57