Merge "Merge "Draw textShadow always first." into nyc-dev am: 45d6e79565 am: ac26a7c427" into nyc-mr1-dev-plus-aosp