Squash commits for SaberMod optimizations

Signed-off-by: Paul Beeler <sparksco@gmail.com>
Update Java 1.7 message for SaberMod:

To install and use properly on Ubuntu 12.04+ reference my Guide on
@XDA
http://forum.xda-developers.com/showpost.php?p=36648289&postcount=19
OTA package naming:  name := $(SM_VERSION)

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>