TestOnlyNDK update