Bug fixes for max-batch-size/ofm-depth

* Conformance regen required for tosa-bi: conv2d conv3d depthwise_conv2d transpose_conv2d
* Include bug fix for testGen.makeShape()
* Include json changes to limit size of tests which now have ofm_depth > 1

Signed-off-by: James Ward <james.ward@arm.com>
Change-Id: Ic8221b9a742f5737df523997bee7260f4dfcdef3