Merge changes I833bff2a,I87c60690

* changes:
  cronet import: set -e -x in cronet_import.sh
  cronet import: set gclient --delete_unversioned_trees