Merge "Add missing libc++ includes" into aosp-main-future