Cm 10.2 merge from androidarmv6