Add new matches for standard folder "Trash"

Change-Id: Id01fc0ce784f8a4622278f17e8ade8c0972ee634
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Remove custom semaphore implementation.

Change-Id: Ib4c6e4b02ea0434ad1991d8f4d3b17c6f133187f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>