Merge "Update NDK headers/libraries from build 2479391."