It was not used or tested on x86 in practice, and the automated arm
tests should obviate the need for a dummy-only x86 implementation.
It should be noted that this change is merely the simplest way to
deal with conflicts with live update (for the second time now).
Change-Id: I6e066c4659c6213cd556144271784588356b140f
6068a2ee9f