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

Change-Id: Id660ed5340c796fb7052d2dac973c4cd44eff4ef