Merge "Fix the Mac libcutils build."