Merge "Fix unused result warnings in system/extras/verity."