Merge "Removing some support lib dependencies" into ub-launcher3-dorval-polish
am: bef710114c

Change-Id: I2c1249d6f40e90f26a83a45b1e361658f8a1ffc1