Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev am: 5c9444216d
am: 6b525a2645

* commit '6b525a2645cfe3bf0003f155d86e270dbb6d622c':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: I2f6c0340ff015daefad2476bc107b2c862842033