Merge "Add m target for matcha fpga tests"