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

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