Merge changes from topic "oj-libjdwp"
am: 2589eb3da1

Change-Id: Id6fb8ab9359d7926a36b3b0a552ad8cab0d13f8f