Merge "Make it easier to run libjdwp.so as debugger for run-test" am: 6cee5e40 am: 3f95ec5c am: db778e55 am: 0bc248bc Change-Id: Ic448ac928b8acbc45f0ed532866e83056a7a6276