ext4_utils: Fix bad merge of EMMC wipe suppression

The order of the modules in the Makefile changed.

The Makefile items for eMMC wipe suppression should be
in the sections for target static and dynamic
libext4_utils.  These were the first two modules in the
file previously, but no longer are.

Move the eMMC wipe configuration handling to the proper
modules.

Change-Id: I86861a89824af04a3b08e75049580df28bd239f7
Merge branch 'jb-release' of https://android.googlesource.com/platform/system/extras into aosp
procrank/procmem fail on 0-length page mappings

procrank prints messages such as:
warning: could not read usage for 279
and does not include that pid in its table of results

procmem segfaults when run against that process

The problem is the 0-length page map at the top of the stack:

beb39000-beb39000 rw-p 00000000 00:00 0
beb39000-beb5a000 rw-p 00000000 00:00 0          [stack]

This patch changes the code to skip over that 0-length mapping when calculating
memory usage

Change-Id: I02aaaecdf64affbd28ab43a2d0865edda33816bc
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/extras into mr1

Change-Id: Idd8ad3d072643c7c818e332af1c62a4f1885cafe
make_ext4fs: fix static utility executable

- static version of libext4_utils is now
  libext4_utils_static
- add libsparse_static to LOCAL_STATIC_LIBRARIES

Change-Id: I2d2e4eafe69f46d848d5b39b4e11ba163b7d25e5
Merge commit 'android-4.2.1_r1.2' into cm-10.1

Change-Id: I6092a813f02583d25ffe39db8f9e95e458eef5ef
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/system/extras into 1.1

Android 4.2.2 release 1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_system_extras into jb-mr1

Conflicts:
	ext4_utils/Android.mk

Change-Id: I431b19e74b1a506a0e6977197ebd415f33799469