am 53b6d510: am 2b296319: Merge "Standardize gamepad layouts on existing...
am 53b6d510: am 2b296319: Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev
* commit '53b6d510':
Standardize gamepad layouts on existing controllers