Merge changes I54d367fd,Ib789dc59

* changes:
  cronet: update tests to use android.net.http API
  cronet: use defaults to enable or disable tests