Squashed

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

This reverts commit 681d6d4cce994548928e7df1e880a28f15b02396.

Conflicts:
	core/Makefile

Small cleanup, only need to clean build.prop once

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>