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

* commit '5c9444216d187ec2126fdd200e499a1fb3f6ee62':
  Prevent LayerDrawable bounds updates from being re-entrant

Change-Id: I616f9b38e7e8fccfa5d1525a1554865466bc5c54