Merge "Disable two tests for no-prebuild."
am: 1aafce4

* commit '1aafce4bb4b158349dcac1166aa049960461a686':
  Disable two tests for no-prebuild.