Merge "charger: android_get_control_file on last_kmsg" am: ee9ba3efe7
am: d8209aa315

Change-Id: I61f5e7dcca97aa5cf2d1e170d2e6a2e77eaf3dd9