am a77b2d2a: am 6525e67f: Merge "Fix bug in WaitForCompilationToFinish"

* commit 'a77b2d2a6ddd0b8c9d1ee0732ea17a63de35ef0c':
  Fix bug in WaitForCompilationToFinish