Merge "Use libbinderthreadstateutils." am: 7d56473816 am: 04613e1ac7

Change-Id: I30474a3797756083df3b16a642e479ddb1dfa60d