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

Change-Id: I0379693d0c87e77eaed7dd133edb00c410d2dfd5