Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb
am: 20f25166c3

Change-Id: Icbdf02f150e14b4c63b24e70e72f0faf3946e130