Merge "Libcutils: Remove unused variable"