Merge "Remove unused reference to android-base/test_utils.h"