am b6ab5507: am 9882ae14: am 39fe7725: am 38a0a2e4: am 6e9f8780: Merge "Add keylayout for shamu headset jack" into lmp-dev

* commit 'b6ab5507586b5ad95da13535b68455defbd42cd0':