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

Each merge fails, so use our targets

Change-Id: I79a6f237ef2c6d5f5b1bb244c520708875ce8bab