Preparing a commit with android 19 target and removing temporary files which cause merge issues.

Conflicts:
	bin/resources.ap_