Merge "Fix bug in ImageDecoder which provided the incorrect density to NinePatchDrawables"