Merge "Add missing annotations, getters to GradientDrawable" into nyc-dev