am b2594c79: Merge "Fix 64-bit capability setting."

* commit 'b2594c791bddf019b665b39825a1c3b4bb9fe70a':
  Fix 64-bit capability setting.