Use -Os instead of -O2.  Should fix build with gcc 4.8

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Add debug tag to user builds
Signed-off-by: Paul Beeler <sparksco@gmail.com>
Enable Dalvik lock contention logging for user builds
Signed-off-by: Paul Beeler <sparksco@gmail.com>
Enable graphite by default
Signed-off-by: Paul Beeler <sparksco@gmail.com>
Revert "Build scripts:  Add a option to enable graphite flags"

This reverts commit 3c8d0b9a39f1c04ceb4904a6c247ff790c006ef9.
Merge remote-tracking branch 'sm/sm-jb-mr1' into HEAD

Conflicts:
	core/combo/TARGET_linux-arm.mk

Signed-off-by: Paul Beeler <sparksco@gmail.com>