Merge with androidarmv6/cm10.2