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

Change-Id: I815189c133f274d1a754327807915a02e642a44b