Merge "libcutils: tests" am: bac388e424 am: 6878cd20e6 am: 2e88b5c803
am: 7df147f3bb

Change-Id: I60fea7cd1e8f9c3e5a0404db3b075469fe827a7a