Merge "Add python3 support for tools"
am: 6015e556fd

Change-Id: I0f2e08761890910457b20331fc415b7cc9025232