Merge branch 'cm-11.0' into stable/cm-11.0

Merge branch 'cm-11.0' into stable/cm-11.0

ota_from_target_files: Validate signatures after possible data wipe

If the data is being wiped, we want to validate the signature after
this step. This is also a good check that the data wipe succeeded.

Change-Id: Iaecfddfb2010944de0c97e7bb21d8e581f20deec
(cherry picked from commit 4379526)

Revert "Revert "ota: Make sure we don't install on top of an incompat…

…ible system""

This should be fixed now.

This reverts commit 5875e34.

Change-Id: Ie102ff6ecb08bff80c83654a490fd18248d23086

Revert "Revert "ota: Make sure we don't install on top of an incompat…

…ible system""

This should be fixed now.

This reverts commit 5875e34.

Change-Id: Ie102ff6ecb08bff80c83654a490fd18248d23086

add option to generate two-step recovery files

When run with the -2 option, ota_from_target_files will generate a
package (full or incremental) that does some extra reboots in order to
install the new recovery first, so that the rest of the installation
is done with the new recovery.  This can be useful if (say) the
package installation needs some features from the newer kernel.

For incremental packages, the verification phase is still done with
the old recovery.

This is only supported on devices where the misc partition is EMMC
(not MTD).

Two-step packages are slower to install and possibly confusing to
users (they will see their device reboot four times instead of twice),
so only use this option if necessary.

cherry-picked from commit 9b23f2c

Conflicts:
	core/Makefile
	tools/releasetools/ota_from_target_files

Change-Id: I4d7b7f3fe45483d9b76bef8ee973eb4e2db4dcdd

Generate extra userdata partition if needed

* To support variants of devices which may come in 16/32/64GB variants.

Change-Id: I74c32d8316f0450a1445fe95a95e5cabb7a9dd1b
(cherry picked from commit ab46c15)

build: add support for Asturian

Change-Id: I43ea9062756a97b0f9cba7bee042dbfcd18b51b5

Just a few more for flexibility

Change-Id: I264191a7ff2235d0effe038c39a976a25985f529

Don't make assumptions about the formats of build descriptions

Change-Id: Id83a7594e9e1b9b4ffbdbaba695506d8d0d21a46