Merge "Replace deprecated APIs in NDK samples"