Merge "frameworks/base/ : added scaled hdpi version of assets that were moved to drawable-mdpi"