Merge "Move IPlatformCompat.aidl definition to framework.jar"