Merge "Revert "Using clippath for adaptive icon drawable instead of bit..."" into tm-qpr-dev