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

Change-Id: I539eae2af282daacf484e244934d75a47d20d7df