am de6a0857: Fix broken interaction of JarJar and Emma.

Merge commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787' into gingerbread-plus-aosp

* commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787':
  Fix broken interaction of JarJar and Emma.