Update some stuff from htc-8960 kernel