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

Change-Id: Ic3682ef3a0e240e95cc86a065b00707d1fa5facf