Importing patches from main tree
* Revert "Fix USB Mass Storage on some devices". This reverts commit 9eb1cd4 from main tree.
bumping version number to 2.8.1.1