Also removed L3 function pointers to the function headers added in go/wvgerrit/186010 because they weren't stubbed out and was causing the new script to fail. Bug: 293359147 Change-Id: I15606bb636a8bd2637bcf48c421a85d82044762b