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

Change-Id: I270a2b6fc009473433a6da8cf6e8a2a157ae0710