am cb902fff: Merge "A few other removals for the 64 bit blacklist."

* commit 'cb902fff82487a63e36e94105db79d4312ea4736':
  A few other removals for the 64 bit blacklist.