Merge "rm libbinderthreadstate" am: d61f0dcaec am: 4c80c8da0c

Change-Id: I25aacc3f1cd9c3544e90934c37cff5a973a7bd7b