Merge changes I1b2e34d5,I75ae5b29

* changes:
  Reapply: Hack libc++ support header to work in the platform.
  Move to NDK r21.