merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I2a69ed763c7b5f29c060d52b41897abd27bc740d
Use updated stop supplicant API

Bug: 7227463
Change-Id: Ifecb256fed68c2046b77a5ce7a8c9f25c8e3fe62
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092

When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
not enough room in the block to insert an extra padding dentry.
Instead, switch to always padding the previous dentry out to the end
of the block, which matches what the kernel does when creating new
directory entries.

Also fix dentry_size to return the size of all the dentries
without the padding, the len + 8 padding is incorrect, and the
DIV_ROUND_UP will round up to the correct number of blocks.

Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc
make_ext4fs: fix dentry padding when dentry size is 4088 or 4092

When the total dentry size is N * 4096 - 4 or N * 4096 - 8, there is
not enough room in the block to insert an extra padding dentry.
Instead, switch to always padding the previous dentry out to the end
of the block, which matches what the kernel does when creating new
directory entries.

Also fix dentry_size to return the size of all the dentries
without the padding, the len + 8 padding is incorrect, and the
DIV_ROUND_UP will round up to the correct number of blocks.

Change-Id: If11f90e4ee172c135a0eae2a50b8be213e2dd0dc
am 430b67d3: make_ext4fs: fix dentry padding when dentry size is 4088 or 4092

* commit '430b67d37c9f0a39bd06c128da96e37866d2ac36':
  make_ext4fs: fix dentry padding when dentry size is 4088 or 4092
Reconcile with jb-mr1-release - do not merge

Change-Id: I6144d785b6b161bf3f84f94b5ae8a612eaf8ffca
make_ext4fs: insert lost+found directory into filled filesystems

Insert a lost+found directory if necessary when creating a filesystem
based on a directory structure.  This will make the resulting image
clean when tested with e2fsck, allowing e2fsck to be run on all images
as a validity test.

Change-Id: I81d0b6b4a802713270d3469e5a3bc555b680ec7e
make_ext4fs: fix sepolicy lookup for lost+found

selabel_lookup needs the full path including mountpoint.

Change-Id: Idc0641683a4e4528d94e54be1897315bf5fcdb0d
am 0f92e16a: make_ext4fs: insert lost+found directory into filled filesystems

* commit '0f92e16a064c285f5c667df7090b07d28e5e098a':
  make_ext4fs: insert lost+found directory into filled filesystems
am c04808a5: make_ext4fs: fix sepolicy lookup for lost+found

* commit 'c04808a532b0421fded05eecf5d843c45b7eb407':
  make_ext4fs: fix sepolicy lookup for lost+found
Merge tag 'android-4.2.2_r1' into HEAD

Android 4.2.2 release 1
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1