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

Change-Id: Ib27d503602b52bcb6ff6c54a56ef678dcc7000d8