merge cm 11 bootloop fix(from p990)