Android 4.0.4 release 1
am e857d898: am 6697426a: am c50afe92: merge intel x86 patches into gingerbread branch

* commit 'e857d8986fb13cd05e30c9c58939580282131b10':
  Add missing LOCAL_MODULE_TAGS defns.