Merge "Fix constant errors in ActivityManagerNative."