Merge "rm libbinderthreadstate" am: 2015fe5dbc am: ecfa97375f

Change-Id: I78467551e63cfac87f67c7a311ea9426a01fac94