Merge "libcutils no longer requires that its users configure ANDROID_SMP."