Drop/refresh patches as appropriate. Disable the aufs support patchset since aufs hasn't yet been updated.
Also update the aufs and lockdown patchsets.