Merge "Reland "Add static libbinderthreadstate explicitly to charger module."""