Merge "libcutils: UNUSED argument warnings"