am 649aa045: am 2dd6f729: Merge "Add a variable to disable PREBUILD in run-tests."

* commit '649aa0454285cc44fa8e2e380255a8672b2cf33e':
  Add a variable to disable PREBUILD in run-tests.