[automerger skipped] Merge "SF: Clean up name lookup in ComposerHal.{h,cpp}"...
[automerger skipped] Merge "SF: Clean up name lookup in ComposerHal.{h,cpp}" into pi-dev am: fb244816
am: 6c06b365 -s ours
Change-Id: Iaffaee07bd8a850fb30f148f7ff36c61095c8133