Merge "Fix NinePatchDrawable handling of density changes" into nyc-dev