Merge "libcutils: tests" am: bac388e424
am: 6878cd20e6

Change-Id: I11758ee49eec3e19a5b9484af7c986eb3f3de769