merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
merge from open-source master
am 6e5be9b2: merge from open-source master

Merge commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c'

* commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c':
  eclair snapshot
fix cut-and-paste error in verifier

Oops.
am c652e41d: fix cut-and-paste error in verifier

Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-plus-aosp

* commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12':
  fix cut-and-paste error in verifier
am c652e41d: fix cut-and-paste error in verifier

Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-mr2

* commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12':
  fix cut-and-paste error in verifier
Security: Fix typo in recovery EOCD detection.

This issue results in the ability to modify the contents of a signed
OTA recovery image.
am 9acf28a3: am c652e41d: fix cut-and-paste error in verifier

Merge commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3' into eclair-mr2-plus-aosp

* commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3':
  fix cut-and-paste error in verifier
add a simple unit test for the OTA package verifier
am 2278a04a: am 9acf28a3: am c652e41d: fix cut-and-paste error in verifier

Merge commit '2278a04a0921007d726e9e1ec4b668860f961f88'

* commit '2278a04a0921007d726e9e1ec4b668860f961f88':
  fix cut-and-paste error in verifier
Recovery changes for Encrypted File Systems.
This change enables/disables the Encrypted file systems feature. It reads some properties form the data partition, wipes the partition out, and then rewrites the proper properties again into the data partition to signal that encrypted FS are enabled.
Merge change I117fdea9

* changes:
  Recovery changes for Encrypted File Systems. This change enables/disables the Encrypted file systems feature. It reads some properties form the data partition, wipes the partition out, and then rewrites the proper properties again into the data partition to signal that encrypted FS are enabled.
am 73ae31ce: add a simple unit test for the OTA package verifier

Merge commit '73ae31ce0ac09c0e45924d817644261c87ab1a60' into eclair-mr2-plus-aosp

* commit '73ae31ce0ac09c0e45924d817644261c87ab1a60':
  add a simple unit test for the OTA package verifier
am 9b430e11: am 73ae31ce: add a simple unit test for the OTA package verifier

Merge commit '9b430e11d6c4fb907d0aa96667142e2c00585e09'

* commit '9b430e11d6c4fb907d0aa96667142e2c00585e09':
  add a simple unit test for the OTA package verifier
use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
Merge commit 'goog/eclair-plus-aosp'
am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions

Merge commit '17a47098d2a4214397f8b30e2692c9487d7ab5ff' into eclair-plus-aosp

* commit '17a47098d2a4214397f8b30e2692c9487d7ab5ff':
  use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
am d36308c2: am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions

Merge commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37'

* commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37':
  use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
merge from open-source master
am 158657bc: merge from open-source master

Merge commit '158657bc5ce438d3cf1f601255896b854fd49103'

* commit '158657bc5ce438d3cf1f601255896b854fd49103':
  Security: Fix typo in recovery EOCD detection.