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

Change-Id: I879f50bd77b6b9225348072b61dd2896fc8546a9