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

* commit '67747887307042d27746300be5f1972903b4a33b':