Add "-ODEX" to the end of the file name if the build is odex
Merge branch 'kitkat-staging' of github.com:AOSPAL/android_build into kitkat-staging

Conflicts:
	core/Makefile
Fix ROM packaging due to commit https://github.com/AOSPAL/android_build/commit/1add7ac059d5592eb2d521318e57ea3cde8559b3

There shouldn't be two same file name, both of them are been used with different priorities.