Fix lint error for those module used in mainline module

Bug: 187861723
Test: rebuild
Change-Id: I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277
Merged-In: I3a8c9e00f164d0f0dd381b188ecfd0c4a758a277
18 files changed