Merge "Clean up libcutils/libutils tests."