[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 42efb44561 am: becc7df8ac

Change-Id: Id73dfb4249a191a95a30edf5e43948c6fcafedb6
tree: f6713aef46f423fe5924d2216d0b69d1cb919484
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE