Merge "Fix setShadowLayer + drawTextOnPath" into rvc-dev am: 7e17bc6496 am: e21afec2c5 am: 697eda359d am: 847725f66e

Change-Id: I06729007ece72910f2b3f6d5af3f027489547315