Merge "Use libbinderthreadstateutils." am: 7d56473816

Change-Id: I72b0f76a2207f8ec8c0c79dd36b80bbeb32791ea