Merge \\"Pass binder ABI to Soong\\" am: 4b4fdf0b2f
am: 85ed718947

Change-Id: I61c15f76aabccdc37c71eaca365b89a1e1b6487a