Merge "Clean up libcutils/libutils tests."
am: 57150963a3

Change-Id: Ie4113224b9ac63caeed6ed8fa3ea9eb7125fa2a6