Merge "Make proc-macro2 available to product and vendor am: 1ea12c6feb am: 051ccb49c8 am: ca697ae367 am: f58bf703cb am: 7bf83716d7"