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

Change-Id: I5d42b9f54a3d0aacf5c75bc1d94f78b99f0831e2