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

Change-Id: If2f75a01db5cf17fd0d8e8414e3b81675b44ec10