am 6697426a: am c50afe92: merge intel x86 patches into gingerbread branch

* commit '6697426a3623c1f90d519a47988ed8d0a8e89f5e':
  Add missing LOCAL_MODULE_TAGS defns.