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

Change-Id: Ia7a3271a3135c44fd03b61545386a1582cc063d7