Require gear 0.5.4

It fixes a bug that affects function re-registration in mergers.

Change-Id: I7247e175365ec75ebb0af9e144171be0c30f519d
Merge "Require gear 0.5.4"