Merge "Add Key mapping to CEC_KEYCODE_SOUND_SELECT" am: 9f26142f3a am: 12cb831abe
am: 23d8bfeb80

Change-Id: I34c894a083e2c80936596a3eee48d989007005a2