Merge "healthd: Correct the scaling factor for maxVoltage and maxCurrent." into nyc-dev

#define FAKE_BATTERY_CAPACITY 42

#define FAKE_BATTERY_CAPACITY 42

#define FAKE_BATTERY_TEMPERATURE 424

#define FAKE_BATTERY_TEMPERATURE 424

#define ALWAYS_PLUGGED_CAPACITY 100

#define ALWAYS_PLUGGED_CAPACITY 100

#define MILLION 10000000.0

#define MILLION 1.0e6

#define DEFAULT_VBUS_VOLTAGE 5000000

#define DEFAULT_VBUS_VOLTAGE 5000000

namespace android {

namespace android {