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

Change-Id: I6e295f30bef2de7fe1840da821db7ea4d8ef72ec