Clean up flags

Change-Id: Iaa66cd431da4be97f3e8cd70b0029167f78b6f43
Revert "Use cortex-a8 instruction set until scorpion is sorted out in bionic"

This reverts commit 931ede11cf8f41549515cfd4689843250831cd26.