Merge "SF: Clean up name lookup in ComposerHal.{h,cpp}" into pi-dev
am: fb24481654

Change-Id: I8760f6263161fdb5c9cad8b7bc7d0d5119a5326e