Merge changes from topic "oj-libjdwp" am: 52a8e03e46 am: aa17c3cb11
am: 3a71e66380

Change-Id: Ic632dfb582c458436474fad6ac0155a0ee77f45e