When a Ti2DMatrix's creation dictionary contains both a scale and a rotate value, need to link two operations together. TIMOB-7440
Merge branch 'master' into timob-7440
Merge pull request #4247 from billdawson/timob-7440

TIMOB-7440: Android: 2DMatrix initalizer doesn't work properly when both "scale" and "rotate" are specified