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

Change-Id: Ieccc2683b327886544caffb634629cfaf2d4f30b