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