cout: move to $out

Change-Id: I3b5bf8a5f62dcdf267662bb97a2073150152cfa6
eat: get the proper MODVERSION

* The version in system/build.prop might be
  different than what the zip is named on incremental
  builds.
* Use CM_VERSION from the build system instead.

Change-Id: If4508921d8fd05219a2f358a2397a13b247065bd
Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_build into cm-10.1

Conflicts:
	envsetup.sh