am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."

* commit '4f4892d00aab13975a8aed000f84ae0320355fd7':
  Workaround 64 bit devices that don't have zygotes yet.