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

Change-Id: I0afbf702654bd90ac29baf606656bd3ea95de6b5