Merge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master