Merge "Reland "Add static libbinderthreadstate explicitly to charger module.""" am: a535e5a64e
am: 6e747562dd

Change-Id: I827e5fc1a2602682fc9400e59475fef9258bfc74