Merge "Move hybrid interface from libbinder to here." am: 05ccd99a0d am: 487c03e720
am: 4264b797a4

Change-Id: Id27bcc2b69e010a88bb420d5d1fa73176543c988