Merge "Remove need for libbinderthreadstate."