am c27e7067: Merge "Fix tests 116 and 118 for no-prebuild"

* commit 'c27e706785c975eb91d9716800aae6c48dc47da6':
  Fix tests 116 and 118 for no-prebuild