Use androidarmv6-build-targets instead of cm-build-targets

Each merge fails, so use our targets