Merge "Move to-upper and to-lower to definitions.mk"
am: 74413198b7

Change-Id: Iac483f693df41e2aa3b9cec049be783979ee0fa4