Merge "Fix runtime namespace links for vendor processes" am: c2aad281fc
am: e1324405a4

Change-Id: Ia1149f0ee5b4f80882a87be1c0c4187d315957c6