Revert "fs_mgr: Drop the context mount option from non-selinux builds"

This reverts commit 806fc566fd4544cfcd3334aa1a992bab0f6d277c.

Revert "fs_mgr: Don't assume all fstab entries have options"

This reverts commit a73b2264dfd89d526054e4be9926be9f50cca791.
fs_mgr: Drop the context mount option from non-selinux builds

Transitioning devices may have the context option present in the
fstab, even if we're not doing selinux builds.
Since we don't set or even create the contexts on those builds,
this will make mount fail, and either the mountpoint ends up absent,
or boot fails entirely

Change-Id: Ic5cc7f5632cc3d62459dfaaf7719d662737e1641
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_system_core into cm-10.1