Merge "CTS secondary_user: Jdwp modules." am: fd80c5a7b6 am: aadb643a2b
am: 4f984afc05

Change-Id: Idf1ef8b83984c5ccba4e7f8defa0011c36591238