Merge "Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead..." into nyc-dev
am: 460b9c08e6

Change-Id: I55c8a7dc7b90a12b177f3923731a2ad913bed60b