Merge "switch to using android-base/file.h instead of android-base/test_utils.h" am: 814c306106
am: 838cac4798

Change-Id: I4b6eec2e80efc0aec0d33add0c55d2f40b79a831