Revert "Revert "Merge branch 'master' of https://github.com/akshay4/android_kernel_htc_pico""

This reverts commit 42f0250090a566153e987f96df151ba839345d9e.