Merge "[1/4] Add user customizable MACRO_x keys in frameworks" into udc-dev