Merge \"Clip GradientDrawable\'s saveLayer\" into nyc-mr1-dev
am: 694acb1e36

Change-Id: I9c1ed4155674e7c7a218c2afe784dd703613d825