Merge "Round the slashes of SlashDrawable" into oc-dr1-dev
am: e1f9b3f195

Change-Id: Ie5974f71084b99c27decadd0522af2a8a46e304d