Merge "Partial: ActivityManager: use proc state from compiled aidl"