Merge changes from topic 'update-ndk'

* changes:
  Update the paths for the NDK libc++ headers.
  Move the "current" pointer to r11.