Merge "Remove need for libbinderthreadstate." am: 26d0eb321c am: 32415facc1

Change-Id: I8b7f0bccf371a9c98f2c274846587325dae1857d