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

Change-Id: I0522130d4c6e2540f5149780a9b40103a94e450e