Merge "Update NDK libc++ header paths."