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

Change-Id: Idd6c21b0e4ab698200a2d1359ce998217e4938c2