Merge "Revert "Update for less arguments in hidl toBinder."" am: 79994cb142 am: 16255fda63
am: 4e743f680e

Change-Id: Iff1739cb98d1f978f6246bbd73a8163822e2e6c7