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

Change-Id: I8d9d5bcaed39facc14e72289db3b4896b162f54d