Fix build for jetpack update Bug: 265818545 Test: build Change-Id: If48e7338ee560d995cb8bff7b5348ab36c457836 Merged-In: If48e7338ee560d995cb8bff7b5348ab36c457836 (cherry picked from commite65283de6a
) (cherry picked from commit5a6444776a
) (cherry picked from commit1c0af48f8c
)