Merge "Make it easier to run libjdwp.so as debugger for run-test"
am: 6cee5e402c

Change-Id: Ia895b6d8c5949673539678439733adba55af02b8