[automerger skipped] Merge "lshal: avoid FQName globals." into rvc-dev am:...
[automerger skipped] Merge "lshal: avoid FQName globals." into rvc-dev am: 9d0cd937 -s ours am: a0281244 -s ours
am skip reason: Change-Id Id0d311319c47553fac5d1d208409cef83073fddf with SHA-1 7a99e049 is in history
Change-Id: I6ef1073887b710c5384b0b6fead00fe790aaf558