Merge changes I664fb325,I5e289469

* changes:
  switch to using android-base/file.h instead of android-base/test_utils.h
  Remove unused reference to android-base/test_utils.h