Android 6.0.0 release 25
Merge "Fix directory path for CarrierConfig overlay for deb." into mnc-dev