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