[automerger skipped] Merge "Remove need for libbinderthreadstate." am: 26d0eb321c am: 32415facc1 am: 1285913187 -s ours
am skip reason: Change-Id Ief28663728fb8786b06bf9e72238052b9af81d87 with SHA-1 2b3f3cd222 is in history

Change-Id: Id14cca667bf7ebcc477d936aa1e1d2bc2909283b