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

Change-Id: I286f8d2a76b2559ef5cb7ddbcf06df9e7afd2078