Merge "rm libbinderthreadstate" am: abecf0482c am: 544f2626b5

Change-Id: I8936ce94ffc8b567a3979008b069cd10df59702f