Add support for zaqar.

Add support for zaqar in a backward compatible manner (marconi should
still work). The marconi bits will need to be cleaned up in the future.

Change-Id: Ib10f24aaa9e6d341b5bde14ee5f101e72999a9a8