SM 4.8 fix

This should do it...
Conflicts:
	vm/Android.mk