xed-encode-direct: more compilation fixes. compiles
xed-encode-direct: more compilation fixes. compiles

Change-Id: I69923d2944343c5662412d1f28407ab3506934e5
(cherry picked from commit 27d61c84695b64ee38f22e3d7b9052f9ed7345a5)

intelxed/xed,intelxed/xed,intelxed/xed,intelxed/xed