fix bugs in rfe12668 implementation

The previous commit added :embed and :keygen but they were already
there.  Resolve this issue.

Change-Id: Ieb962a12880394e67d973835945005446833fab7