am 4889f155: am ae5b0e56: Merge "Move jdwpspy from development to dalvik (1 of 2)"

* commit '4889f1558a7cc4d8dee552aeba6873c4a48bbd09':
  Move jdwpspy from development to dalvik (1 of 2)