KTU84Q
Revert "Revert "ota: Make sure we don't install on top of an incompatible system""

This should be fixed now.

This reverts commit 5875e3437d368411b986de70d3a844b27d78531f.

Change-Id: Ie102ff6ecb08bff80c83654a490fd18248d23086
Merge tag 'android-4.4.4_r2' into HEAD

Android 4.4.4 Release 2
envsetup: fixup dopush

* After clobber, $OUT does not exist and tee cannot create .log; fix
  this by calling mkdir -p $OUT
* Make sure Copy and Install are at the beginning of the log line being
  analyzed and also search for ':' so that "Copying:" lines don't count
* Fix Copy file list by quoting so shell doesn't think this is a
  command: $LOC $(...)
* Fix 'only copy files from $OUT' now that multiple file pushing works
  right
* Only stop java services once (if needed) and then wait to restart
  services until after all files have been pushed
* Change location of SystemUI.apk to priv-app

Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Change-Id: I65edd34bf445b28c2638cb3e9621719121fb962f
envsetup: dopush: set file permissions on files pushed to /data too

* If pushing to /data, transfer old file owner, group, permissions to
  pushed files, then restorecon

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

Conflicts:
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files

Change-Id: I05d9c2bada04f5065e02cbe6dd523b8e0c840b18