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

Change-Id: I04d3689fe1410263de86b106ca91ea1e55f2492e