Merge "Link to system namespace using stub libraries" am: ad91df7caf am: d922462fd4

Change-Id: I213187765abc972d3df794b79a47f88e43d1e620