Merge "Rename libbinder specific variable." am: 3999eb332b am: 80290f0e01
am: faf4eb9601

Change-Id: I9e088524e511c673e626c6db66d43a6b27abd0b9