Merge "Fix build for compiler update." am: d341fba5dc am: e976ea55be

Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1790958

Change-Id: I51a6591227a6a77fc6f399597d5312232c477b82