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

Change-Id: Iad1cc358186f472baa836a2a3895c18bcad2d9ff