Merge "libcutils: remove some unused API."