Changes to libcutils