Merge "Add static libbinderthreadstate explicitly to charger module."