Merge backport of new Binder API

bug 1456092

Conflicts:
	libs/binder/Android.mk

Change-Id: I04007ec99900f47adeef23890d68afc0ae6bda24