Revert "cherry pick tidy up (#14244)"

This reverts commit f2c9e82e5b.

tmk_core/common/test/flash_stm32_mock.c

@@ -47,3 +47,4 @@ FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data) {
 FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) { return FLASH_COMPLETE; }
 void         FLASH_Unlock(void) { flash_locked = false; }
 void         FLASH_Lock(void) { flash_locked = true; }
+void         FLASH_ClearFlag(uint32_t FLASH_FLAG) {}