Build fixes with teh super blcoks and 32x32 expts

Change-Id: I3c751f8d57ac7d3b754476dc6ce144d162534e6d
3 files changed