Merge "Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG"