Android 6.0.1 release 42 (MOB30I)
Merge "Fix directory path for CarrierConfig overlay for deb." into mnc-dev