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

Change-Id: Iefaec235fcaed1cd6e4efe23d6f8729780622e3c