Merge "Add 64 bit support to verity build."