Revert "Change M8 build."

This reverts commit 9061ff9aa283281e4716ac707917b523fd84fa91.