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