Revert "Merge remote-tracking branch 'github/3.15/aufs' into 3.15/master"

This reverts commit 50f5429556cb3cb15022e85925f8b45b54cac72e, reversing
changes made to 05c37ded610723d7b39820c3a0dea4e6205e9ec0.