Merge "Fix definining of ANDROID_SMP."