Merge "Fix directory path for CarrierConfig overlay for deb." into mnc-dev