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