Merge "msm_shared: update rule to build usb30"