Merge "Remove unused reference to android-base/test_utils.h"
am: 238e18a5a2

Change-Id: I3c296ee23e734f99f93aea2a8a63712f9d40b506