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

We can't use calendar since since some gapps packages replace it.

This reverts commit a0c756677814e81f63b56b30cd0831c543154520.

Change-Id: Ic46589e47728804f2d89051f4aecf355f37d85a0
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
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0