Merge "Add static libbinderthreadstate explicitly to charger module." am: 87b6cb497b
am: 0a802dc2f5

Change-Id: I9e788102bec2047b90a4442439a62b6249d35522