Androidarmv6 merge