androidarmv6 merge