Fix clang errors on array initialization

Change-Id: I9c90b018f0f9477462b28f970b30d15084005ce4
Merge topic 'FixHyperTreeCxx11Errors' into master

d24747f6 Fix clang errors on array initialization