am ac21d5c3: Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev

* commit 'ac21d5c36e0102d9f4594b845405432f72f41838':
  Invalidate the cached ripple drawable mask if mask layer changes