Merge "Updating FolderIcon drawing to avoid dependency on software layer." into ub-launcher3-dorval
am: 3ba48fa019

Change-Id: Id18f5a34264411582115cde8cddd0dc8ecded8df