Merge "Update NDK headers"