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

* commit '64432a513c7090d498daf3ce5d4daf2e6f1aa740':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: I09ad57a573d8e6e5dfc23bb6794af3755a66fac3