Merge "Add PNG and 9-patch support"