Merge "healthd: charger loads resources from /product" am: 9474063654 am: c85de61ada
am: 2e62511bcb

Change-Id: Ib394be6e96541e21142b9f868ad414bbb7327691