am 4bc228e3: am f656b683: am ada7fa06: Merge "Fix perfboot.py to work with the recent change."

* commit '4bc228e317885c7cca82751e867ba80f82bb5a71':
  Fix perfboot.py to work with the recent change.