Merge "Fix RS NDK usage so we always pull from "current" instead of NDK 8."