Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev am: a04451827e
am: 9f79e64be7

Change-Id: I57725db46cfb73aca1fa790d01e175241805dde4