Merge "Use -nostdlib++ instead of -nodefaultlibs" am: a63ce3af4c am: ad3ac35f8e
am: a7db2d4f4e

Change-Id: Ib0d9139ab24e42db3f21b47820ae9c40b799671a