Merge "switch to using android-base/file.h instead of android-base/test_utils.h" am: 2c06aceacc am: bfc330512a
am: 8f5cd4d1c2

Change-Id: I6319ce6f28736b108217ce39fd0d8dfa8ac45b08