JLS36I

Conflicts:
	core/build_id.mk
Merge branch 'jb3' of github.com:LiquidSmooth/android_build into jb3