Add ST media and etc

Conflicts:

	include/android/configuration.h