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

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