am ddbcce3a: Merge "resolved conflicts for merge of be50507b to...
am ddbcce3a: Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit 'ddbcce3a'
* commit 'ddbcce3a':
Keep track of remaining fd when devices are removed