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

Change-Id: I6c36b9599739ab2fbe8da32a8794c8beaa62739a