Revert "m7-common: missing fi statement"

This reverts commit d3e8884b18e453858217ca788e8eb5c2d52bcc26.

Change-Id: Ia5adc1b5eb59fedc798b0827fa0c7d140917c2c4