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

* commit '88a996455b1f3906765cc177c461d38cc9bfda92':
  Workaround 64 bit devices that don't have zygotes yet.