Merge pull request #1615 from Sonicadvance1/fix_cpu_helper [Android] Removes CPU architecture number from CPU helper.
