Merge "Fix crash in ShapeDrawable" into jb-mr1-dev