Merge "Apply new Android keycodes to CEC keycode mapping." into lmp-mr1-dev