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

Change-Id: Idc3fc385d890ecad65bd2eb3f30e40d655972ebb