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