remaining commits from a3955269

https://bitbucket.org/a3955269/galaxys2_kernel_repack/overview
Merge pull request #8 from PhilZ-cwm6/patch-3

remaining commits from a3955269