Fix incompatiblity issue with upstream open-dice am: cb12319644 am: c1bc62e9f7 Original change: https://android-review.googlesource.com/c/trusty/lib/+/3332921 Change-Id: I2e2911e88a9b93d9f283eb40796fdd36d02e4590 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>