Merge "libhealthloop: Remove the POWER_SUPPLY_SUBSYSTEM macro"