Revert "s4-common: use per-device akmd binary"

This reverts commit ccd8d11bffcfeae7163e9f7b96917f1b8d93476e.

Change-Id: I1466b8e7e60141e16f7e6c3f756ae0f7f68140a8