add back msm7k project (librpc is needed)
Conflicts:
	default.xml