Add "-ODEX" to the end of the file name if the build is odex
Fix ROM packaging due to commit https://github.com/AOSPAL/android_build/commit/1add7ac059d5592eb2d521318e57ea3cde8559b3

There shouldn't be two same file name (check line 1342), both of them are been used with different priorities.
Revert "Fix ROM packaging due to commit https://github.com/AOSPAL/android_build/commit/1add7ac059d5592eb2d521318e57ea3cde8559b3"

This reverts commit 1906e187e37b78ce6cc532f12b94b9057348b9c8.
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
Revert "Revert "Fix ROM packaging due to commit https://github.com/AOSPAL/android_build/commit/1add7ac059d5592eb2d521318e57ea3cde8559b3""

This reverts commit cdbd674210d88740a72f4c141d86a48fc1ba8f8b.
Merge remote-tracking branch 'build/kitkat-staging' into kitkat

Conflicts:
	core/Makefile
We still need CUSTOM_TARGET_PACKAGE, or else it will not show the version on zip files (1/2)
Merge branch 'kitkat' of github.com:AOSPAL/android_build into kitkat

Conflicts:
	core/Makefile
Merge remote-tracking branch 'upstream/kitkat' into kitkat

Conflicts:
	core/Makefile