Merge "Load vendor public libraries to sphal namespace" am: f653eaa322
am: 1f09ef9f57

Change-Id: Idc932799969b324056c046039b112bf236fbfcfe