Merge "Fix GamepadTestCase#testButtonA CTS test"