Merge "Update EditText background drawables on API 21" into mnc-ub-dev