Merge "Revert "Add static libbinderthreadstate explicitly to charger module."" am: f41dc66201
am: cc2e1fc2e8

Change-Id: I58c849ec3a98144361ba21089cd29be442aa1eba