Merge "healthd: Fix charger_res_images_vendor install location"