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

Change-Id: Ie720b289fa5ec9f3fdd11fdf02b9d12d71e3ba89