Update to 4.3.20 (and stock ROM to 4.3.2), cleanup and fixes