Merge remote-tracking branch 'upstream/master' into libcxx4

Initial revision of libcxx for Android.