Squashed commit of the following:

commit a2cff2275e1b501ff478b03757d6e4f05fddc2db
Merge: 1e0582c 49cc2ff
Author: Nick Kralevich <nnk@google.com>
Date:   Sat Feb 23 02:04:42 2013 +0000

    Merge "yaffs2: update fs_config calls for capabilities change."

commit 49cc2ffe1feae14951a7174625ba7269685a5357
Author: Nick Kralevich <nnk@google.com>
Date:   Wed Feb 20 12:48:13 2013 -0800

    yaffs2: update fs_config calls for capabilities change.

    Change-Id: I84b935f5e6ee5adb8bedaa8c70acca471d6af959

commit 1e0582c09b355c1722f31c8a790b4d69c792ce1c
Merge: c7e18f4 f122d1c
Author: Kenny Root <kroot@google.com>
Date:   Tue Oct 16 18:39:22 2012 -0700

    am f122d1cb: Merge "Remove HAVE_SELINUX guards"

    * commit 'f122d1cb99f0f510625c11fb3f6d3e47adaf585c':
      Remove HAVE_SELINUX guards

commit c7e18f46a80fbe5d95b01316eb83fddd5f0869fe
Author: Kenny Root <kroot@google.com>
Date:   Tue Oct 16 17:25:27 2012 -0700

    Remove HAVE_SELINUX guards

    (cherry picked from commit 254d3a6e9a16e0bf5aac7e77196650edcc77a655)

    Change-Id: Ib2896c47560906a2cd8203d98887fbfeaf09f8ad

commit f122d1cb99f0f510625c11fb3f6d3e47adaf585c
Merge: d66b3e8 254d3a6
Author: Kenny Root <kroot@google.com>
Date:   Tue Oct 16 17:34:14 2012 -0700

    Merge "Remove HAVE_SELINUX guards"

commit 254d3a6e9a16e0bf5aac7e77196650edcc77a655
Author: Kenny Root <kroot@google.com>
Date:   Tue Oct 16 17:25:27 2012 -0700

    Remove HAVE_SELINUX guards

    Change-Id: I58b84e6fbbaf4471531ca4e468beb283f804fd9a

Change-Id: I4a3a71cb0dd1971db8390e857c8d3846ece82dbb