Enable for both arm64 and x86. Change-Id: I091241994ac5199d6b4e8131cff2affb11569ade Bug: 153583123 Test: compile Signed-off-by: Will McVicker <willmcvicker@google.com>