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

Change-Id: Ia27c81a8cfef0ec21024a0f3ce51fa3f2077ea85