Make sure python scripts run with python 3
am: c52010acac

Change-Id: I2f5c86478d31803e23affb19a428c4e85faf30ce