Move to omni-armv6

Change-Id: Ia480af56cf036e568bc69ce3a6a07c70e33d5a7c