am fc6be460: am 4781e30a: resolved conflicts for merge of de949b11 to jb-mr2-dev

* commit 'fc6be460ca512965aa97cc79756644db8bbe1e72':
  Add module names to emulator PRODUCT_PACKAGES.