montblanc: cleanup and update for STE encoder/decoder

Change-Id: Id6958e183f58de8c7fecf4aeab4baeb3ac6445b2