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

Change-Id: I0c455086e88ed0809431a3c8d88ad72d30764625