Reconcile with jb-mr1-release - do not merge

Change-Id: I91572ae0a96d0f7450b8afff1b32167c8dd0c086
Extend the maximum number of partitions from 4 to 32

Some platforms needs more than 4 partitions, e.g. the lt26.

Change-Id: Id22125313824b0ae15a4596709f52c4ab609a542
Extend vold support for creating ext4 images.

Augment the Ext4::format function to take
a mountpoint parameter. This will then
be passed to make_ext4fs through the
-a option to allow proper security labeling.

Change-Id: Ic26703406a2c463c12e32c8103a0c75c727b7d29
Merge "Extend the maximum number of partitions from 4 to 32"
am 2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"

* commit '2d1e5e9680dcd29628f100c172e6d7d17d90ef2a':
  Extend the maximum number of partitions from 4 to 32
am f7e7ee96: am 2d1e5e96: Merge "Extend the maximum number of partitions from 4 to 32"

* commit 'f7e7ee969d9f286315ff153cb979e29e08cee9f4':
  Extend the maximum number of partitions from 4 to 32
am 6947904a: Handle multi-user mountObb() requests.

* commit '6947904a76b69a1db20a3ddd30c0bcd281922fde':
  Handle multi-user mountObb() requests.
Reconcile with jb-mr1-release - do not merge

Change-Id: I1071ef79a7f5080b822cc4032647ea1feacd5d12
am e919efea: Workaround a kernel race when loading dmcrypt table

* commit 'e919efea94b178ed214ed2e78ef0d008727d62ab':
  Workaround a kernel race when loading dmcrypt table
am b77bc469: Update environment variable for multi-user.

* commit 'b77bc4696b19d9b1ef82810f8d5f671c963d1dc1':
  Update environment variable for multi-user.
Reconcile with jb-mr1-release - do not merge

Change-Id: I4024b1fab0705f6b943ef6b0633ad9e29beacb73
am 7a3c3d46: Unmount in-place instead of using MS_MOVE.

* commit '7a3c3d462ebd58bda0ceaba9c00c385d44c13d08':
  Unmount in-place instead of using MS_MOVE.
Reconcile with jb-mr1-release - do not merge

Change-Id: Iac520484dec44e5f54fe0aca54010520aa8fd7e2
am 9dedfd47: Fix encryption on certain devices

* commit '9dedfd473dc59e0277004e5b917e4eced02c8af5':
  Fix encryption on certain devices
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ifffd0bab9123c37df7c9abdbf166e32ca9850835
Merge "Extend vold support for creating ext4 images."
am fd5b29be: Merge "Extend vold support for creating ext4 images."

* commit 'fd5b29be8c572058ed9ab0198f5603e96c585d3c':
  Extend vold support for creating ext4 images.
am 92736efa: Another fix for encryption

* commit '92736efab068bdbfeb1177544907b84511fb04e0':
  Another fix for encryption
Add snprintf truncation and output error checks.

Change-Id: If7fc9bba4b6cd4b01d2c19e967105ffc57169e97
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Merge "Add snprintf truncation and output error checks."