Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
am: 4b60ee5

* commit '4b60ee5b7b61ac7bdeb983469547e23d698332a2':
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.

Change-Id: Ia291b6b93922bfacee331e2870a52eec89f0b108