Merge "firmware_class: Add an additional path to fw_path list" into msm-4.8