Merge "binderLibTest: remove unused locals" into stage-aosp-master
am: 876b1a6675

Change-Id: I90aa0b29dbb7db685c4d911e796cfa930981f6c5