Fix 1

Change-Id: I8afaa23bff5656d9bf4e9e694280e02e46b08a9f

Conflicts:

	Makefile
Add CC_OPTIMIZE_MORE and CC_OPTIMIZE_FAST

Change-Id: If03dd0adcc2c04dca5fbb63858bdd53ed2e8b339