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

Change-Id: Id3de525f59d4faae1d176e1ac7b8fde591c42f16