Merge changes If2a10ad3,Ia086a5a4

* changes:
  msm: Initialize mach_id before use in ssbi_keypad_init.
  smem.h : Change array size to avoid buffer overflow