Merge "Move values-w230dp-h220dp to values/" into ub-calculator-euler