vs985: initial commit

Change-Id: Id39ecfb480feae8e3bf64cd0965a1990f831e00f

Conflicts:
	g3-common/Android.mk