Merge "msm: pcie: expand PCIe boot option" into msm-4.9