Merge "Misc ActivityManagerNative cleanup."