Merge "Add getExtension to android.os.IBinder interface" am: 935dfd2ce9 am: 84642d37d5

Change-Id: I7e67000c0434f9f8b72af643d4fd23892fcbbb6c