Fix errors

Change-Id: I100d87a4c86ffaa34804106fefa62a49a1db492d
Signed-off-by: Evan Anderson <evan1124@gmail.com>
More error fixes

Change-Id: I60fb8e100f57142837b7cfbff222e6c02dd7e30a
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Revert some fixes

Change-Id: Idb6b58206456b1eab8fb4204d2cca7ad1286ef15
Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge branch 'linuxman/jellybean'

Signed-off-by: ayysir <dresadd09691@gmail.com>

Conflicts:
	include/private/android_filesystem_config.h