am c87b4134: Merge "Add 64 bit support to verity build."

* commit 'c87b4134e5504bec39c4ed36b97863d7ed51dee1':
  Add 64 bit support to verity build.