Merge "android.mime.types: Add application/x-wifi-config."