Reverting until we fix the buildbot failures on jdwp and libcore. Bug: 26719109 This reverts commit 770b39eb. Change-Id: Ifba366d2ddc9311737b6ea29c007475a40cc803f