Change addCategoryLinks() to use array_fill_keys

Previously it used an ugly array_combine hack.

Change-Id: I6bc4fb5cfffda468c61037588ebb4399b5121db5
Merge "Change addCategoryLinks() to use array_fill_keys"