Clean up compile flags

Change-Id: I68fd998b931f88cbe7ed633b8d137d1944acefe9
d
Merge remote-tracking branch 'upstream/jellybean' into jellybean

Conflicts:
	tools/roomservice.py
Merge branch 'jellybean' of github.com:ParanoidKang/android_build into jellybean