Merge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master am: 77a833f3e0
am: eb3326be84

Change-Id: I5144f9ae34f74b31d3087d69b40eb1157986adf9