[automerger skipped] Merge "Use libbinderthreadstateutils." am: 7d56473816 am: 04613e1ac7 am: 69dc96fc41 -s ours
am skip reason: Change-Id I5615f4e8863487d0de8dad2d0529214750897036 with SHA-1 89a2c5ceef is in history

Change-Id: I4b0e09349f091cfd3788ecbe6e47fd2d19fc4e63