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

Change-Id: I3e36d8ab9a629377529afbb1c0276c79d3414a00