Merge "libbinder should not be included in APEX" am: 4807606cf1 am: cdcac66268
am: d8c95952a0

Change-Id: I2479b0b1bc9b8d16662666e4dae8640eaa8369ed