Add Ctfrommn's Nexus 4 s4 patch by request and cleanup a little