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

Change-Id: Ia7034affc1ab8f075718299e43e2d45020f09f17