Add more tools to the Debug and Host Runtime APEXes. am: 6dd6212f74
am: 5f8cb047b6

Change-Id: Id33f5bc6cb7b090368c2f2a35475b3205cc08a38