bring inline with 3.0.8 psyke83/androidarmv6