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

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

Change-Id: If51c75c3b9d5d39dfa8d0ed6c8113ed68ed430ee