Merge "switch to using android-base/file.h instead of android-base/test_utils.h" am: b9cb149441
am: 634efd992d

Change-Id: I9e295ae7372c2912cdc48082bce9f59a043b0412