Merge "Apply clip at reorder barriers to shadows" into nyc-dev
am: b38cb04

* commit 'b38cb04952202c330b29237aaeeda51165298a57':
  Apply clip at reorder barriers to shadows

Change-Id: I33bad16dda8a2618d14e9b345069758f081ed4eb