Split up patches into seperate file; add more UTF-8 patches for Android locale.