Reconcile with CFX and AOSP

Codefirex reverted his own commits here, and I'm discovering the sdcard1 issue is related to libblkid returning a NULL partition type, despite it clearly saying vfat when invoked in a cli.... could probably string-bang the type out of it, but MEH.

Squashed commit of the following:

commit 36324bf0cbd683a9b96d1023a429292f1c9710bb
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Wed Jul 3 00:46:12 2013 -0400

    Revert "vold: use blkid to detect filesystem type"

    This reverts commit fc1dcc1c50d2c6745d57dd7905c4e889a51e6af1.

    Change-Id: I34474f6cdce9bb96e71293df2b864a978df73953

commit 7a931077beeee36b54b32c6f723f29e99c41b1b9
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Wed Jul 3 00:45:30 2013 -0400

    Revert "vold: add support for ext4 media"

    This reverts commit e336c0ca31f2768661063220e2a1cb83fd55b92d.

    Change-Id: If37c2a424fd6d5ee058f735f779a6ca0b0ac68a7

Change-Id: I0687629063c81a0b3c8e517334d20c4cb56f8c11