Revert "Add "-ODEX" to the end of the file name if the build is odex"

This reverts commit 681d6d4cce994548928e7df1e880a28f15b02396.

Conflicts:
	core/Makefile
Merge branch 'kitkat-staging' of github.com:AOSPAL/android_build into kitkat-staging