Merge "Support odd (that is, non-even) densities in GradientDrawable#testPreloadDensity" into oc-dev am: 54eaeca37f
am: 6c5020839d

Change-Id: I9690a023104b5e89b6e812cd656b0c6a80bcc797