Merge "Fix TextViewCompat#getCompoundDrawablesRelative on API 17" into nyc-mr1-dev am: 70c7db5648
am: 3582f83297

Change-Id: Ifa4c2a42ee3596953908c76dc52db3f8e6005384