Restore compiler flags, change fpu to neon

Change-Id: I19c45261afddfdedaa0dc1ceb87b3a66d5f2717d
Merge branch 'cm-11.0' into martincz