Merge "ActivityManager: use proc state from compiled aidl"