Merge "Rename libbinder specific variable."
am: 3999eb332b

Change-Id: I2ba94d5918887e9a08d9167caa2760f0472b08f8