Merge "Minor updates to reflect libbinder changes."