am 1f5d4e97: systrace: handle user builds more gracefully

* commit '1f5d4e97822266b682a8a599b532b3b6460f9e3f':
  systrace: handle user builds more gracefully